Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EntityBlockStorage + Beehive #7316

Open
wants to merge 18 commits into
base: dev/feature
Choose a base branch
from
Open

EntityBlockStorage + Beehive #7316

wants to merge 18 commits into from

Conversation

TheAbsolutionism
Copy link
Contributor

@TheAbsolutionism TheAbsolutionism commented Dec 27, 2024 •
edited
Loading

Description

This PR aims to add support for EntityBlockStorage. Allowing users to add entities into an entity block storage such as beehives, release the stored entities, clear the stored entities (Paper) and get the current + max entity count.
As well as support for Beehives such as target flower and honey level.

Target Minecraft Versions: any
Requirements: none
Related Issues: none

Efnilite
Efnilite requested changes Dec 27, 2024
View reviewed changes
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntiyCount.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/bukkitutil/EntityBlockStorageUtils.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/bukkitutil/EntityBlockStorageUtils.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprBeehiveHoneyLevel.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprBeehiveHoneyLevel.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntiyCount.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageMaxEntities.java Outdated Show resolved Hide resolved
@Efnilite Efnilite added the enhancement Feature request, an issue about something that could be improved, or a PR improving something. label Dec 27, 2024
ShaneBeee
ShaneBeee suggested changes Dec 27, 2024
View reviewed changes
Copy link
Contributor

@ShaneBeee ShaneBeee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple minor things

src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprBeehiveFlower.java Outdated Show resolved Hide resolved
ShaneBeee
ShaneBeee suggested changes Dec 28, 2024
View reviewed changes
Copy link
Contributor

@ShaneBeee ShaneBeee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good, just one little nit pick

src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated Show resolved Hide resolved
ShaneBeee
ShaneBeee approved these changes Dec 28, 2024
View reviewed changes
Copy link
Contributor

@ShaneBeee ShaneBeee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is my approval for fun 👍

sovdeeth
sovdeeth requested changes Dec 28, 2024
View reviewed changes
Copy link
Member

@sovdeeth sovdeeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

syntax comments

src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprBeehiveFlower.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageMaxEntities.java Outdated Show resolved Hide resolved
sovdeeth
sovdeeth requested changes Dec 28, 2024
View reviewed changes
src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated Show resolved Hide resolved
sovdeeth
sovdeeth requested changes Dec 30, 2024
View reviewed changes
Copy link
Member

@sovdeeth sovdeeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks pretty good

src/main/java/ch/njol/skript/effects/EffClearEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated Show resolved Hide resolved
@Efnilite Efnilite added feature Pull request adding a new feature. and removed enhancement Feature request, an issue about something that could be improved, or a PR improving something. labels Dec 31, 2024
sovdeeth
sovdeeth requested changes Dec 31, 2024
View reviewed changes
Copy link
Member

@sovdeeth sovdeeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just some edge cases, everything else looks good

src/test/skript/tests/syntaxes/expressions/ExprBeehiveHoneyLevel.sk Show resolved Hide resolved
src/test/skript/tests/syntaxes/expressions/ExprEntityStorageEntityCount.sk Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ShaneBeee ShaneBeee ShaneBeee approved these changes

@Moderocky Moderocky Awaiting requested review from Moderocky

@Efnilite Efnilite Awaiting requested review from Efnilite

@sovdeeth sovdeeth Awaiting requested review from sovdeeth

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
feature Pull request adding a new feature.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@TheAbsolutionism @sovdeeth @Moderocky @ShaneBeee @Efnilite